Skip to content

draft: ffmpeg5 split #42936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
zlice wants to merge 104 commits into from
Closed

draft: ffmpeg5 split #42936

zlice wants to merge 104 commits into from

Conversation

@zlice
Copy link
Contributor

@zlice zlice commented Mar 22, 2023 •
edited
Loading

[ci skip]

Testing the changes

  • I tested the changes in this PR: YES

I have conflicting changes from intel packages and don't want to mess with my system. If it makes sense I'll move these changes here like I originally intended. ffmpeg5 makes Intel vaapi easier and only rely on oneVPL iirc.

I do not use 80%+ of these packages. I may be able to run Blender, and I use shotcut.

New package

Local build testing

  • I built this PR locally for my native architecture, x86_64

Discussion

Continuation of #36315 - thx tibequadorian :)

It was suggested to make ffmpeg version 5 and 'copy' (create a new?) ffmpeg4 package, and that seems to work well.

As stated, I haven't and probably won't test most of these packages, hoping for others to voice in on what's working.

A few months back (and now) afaict everything has been compiling with ffmpeg5 except for the few problem packages still using ffmpeg4 (below). Can add to the ffmpeg4 list as a incompatible package is found.

libavresample is deprecated, but marked as a dependency when trying to build other packages and install ffmpeg(5). I think the right way to handle this is make a meta package and the add to removals?

gstreamer 1.22.1 updates could go before this

Commit naming / misc

ffpmeg4 isn't "new", not sure what the commit messages should be really for the 4 and 5 split. Additionally xlint complains about ffmpeg4 revision being 3 and not 1 because it's a "new" package, I assume that's right but not sure.

Not sure how commits should be separated. ffmpeg4/5 could be split and all the rev bumps included (otherwise it's over 100 commits). opencv was updated to 4.7.0 for ffmpeg5 so I figured that should be a separate commit?

I wouldn't mind moving the intel packages into here under another commit. That just got a potential fix that may allow merging but I imagine moving to ffmpeg5 will change and even remove some of those packages. (I won't really test these changes without Intel vaapi either way.)

Maintainer for previous ffmpeg(4) was orphaned, I can put my name in there if that matters, though I don't exactly see myself keeping up on ffmpeg.

STILL FFMPEG4

These are a mix of emulators, games and/or older packages.

  • attract (multiple patches in master)
  • audacity (3.2.x should work but void is missing some libs? vst3sdk?)
  • ccextractor (master patches? no release)
  • vice
  • mlt
  • synfig (mlt)
  • tvheadend
  • ssr
  • spek-alternative
  • ppsspp
  • olive
  • moc
  • mediastreamer
  • libextractor
  • idjc
  • hedgewars
  • handbrake
  • ffmpegthumbnailer
  • ffmpegthumbs
  • deadbeef
  • omxplayer
  • qtav (fork has ffmpeg 5 patch - https://github.com/cmguo/QtAV)
  • qt5-webengine (need patch and version bump. may work? if not gentoo has a patch? https://bugs.gentoo.org/831487)
  • vlc (vlc4 will support ffmpeg5, there's a patch to build 3.x with ffmpeg5 but it will lack vaapi)
  • osg (OpenSceneGraph plus xine-lib)
  • ytmdl ? not sure but it uses python3-ffmpeg-python which being 6-8yr old I imagine is ffmpeg4
HAVE NOT BUILT YET (big-uns)
  • omxplayer (rpi only?)
  • kodi
  • electron19
  • qt5-webengine - some patches and version update
  • digikam (qt5-webengine)
  • chromium - some patches but vaapi doesnt seem to be working (use special flags)
UPDATED (for ffmpeg5)

  • unpaper: update to 7.0.0.

  • guvcview: update to 2.0.8.

  • qt5: update to 5.15.8

  • qt5-webengine: update to 5.18.13

  • shiboken2: revbump for qt5.15.8 (patch)

  • python3-pyside2: update to 5.15.8 (patch)

@zlice zlice force-pushed the ffmpeg5-split branch 2 times, most recently from 8d3425b to ff0bb80 Compare March 22, 2023 22:58
@paper42
Copy link
Member

paper42 commented Mar 22, 2023

fpmeg4 isn't "new", not sure what the commit messages should be really for the 4 and 5 split

It is a new package

Not sure how commits should be separated. ffmpeg4/5 could be split and all the rev bumps included (otherwise it's over 100 commits). opencv was updated to 4.7.0 for ffmpeg5 so I figured that should be a separate commit?

as mentioned in CONTRIBUTING.md, use one commit per package

Testing the changes

I tested the changes in this PR: NO

I have conflicting changes from #41132 and don't want to mess with my system.

I don't think it's a good idea to blindly do a complex update like this and not even test it.

@paper42 paper42 marked this pull request as draft March 22, 2023 23:08
paper42
paper42 reviewed Mar 22, 2023
View reviewed changes
paper42
paper42 reviewed Mar 22, 2023
View reviewed changes
paper42
paper42 reviewed Mar 22, 2023
View reviewed changes
paper42
paper42 reviewed Mar 22, 2023
View reviewed changes
paper42
paper42 reviewed Mar 22, 2023
View reviewed changes
paper42
paper42 reviewed Mar 22, 2023
View reviewed changes
@paper42
Copy link
Member

paper42 commented Mar 22, 2023

due to the large amount of random issues I found, I am not confident that the parts of this PR that I didn't check (like the huge lists of dependencies) don't contain similar random mistakes. Even if everything gets fixed, I don't think we should merge this without carefully checking every single line which is probably way harder than just doing the update again.

@zlice zlice force-pushed the ffmpeg5-split branch 2 times, most recently from cd0b824 to 016e8ff Compare March 23, 2023 00:15
@sgn
Copy link
Member

sgn commented Mar 23, 2023

I'm advocate for not using major version of package as suffix for libraries' package name, instead, I think those libaries should use its SOVERSION for pkgname, like Debian.
For example, the new libswscale4 should be named libswscale5, the one splited from ffmpeg5 will be named libswscale6.

@zlice
Copy link
Contributor Author

zlice commented Mar 23, 2023 •
edited
Loading

have a list of some packages that didn't build last night, i'll look at them today(?)

For example, the new libswscale4 should be named libswscale5, the one splited from ffmpeg5 will be named libswscale6.

not sure what you mean, rename libxxx's to lib*5 and have lib*5 and lib*4?

zlice added 22 commits March 23, 2023 15:48
@zlice
qt6-multimedia: revbump for ffmpeg-5.1.2
0f70d30
@zlice
qt6-webengine: revbump for ffmpeg-5.1.2
adaacbe
@zlice
qtav: revbump for ffmpeg4-4.4.3
db93479
@zlice
qtox: revbump for ffmpeg-5.1.2
f05e31d
@zlice
retroarch: revbump for ffmpeg-5.1.2
60adffd
@zlice
scrcpy: revbump for ffmpeg-5.1.2
739450e
@zlice
spek-alternative: revbump for ffmpeg4-4.4.3
7308852
@zlice
ssr: revbump for ffmpeg4-4.4.3
756b1e3
@zlice
sumo: revbump for ffmpeg-5.1.2
7fc41c8
@zlice
synfig: revbump for ffmpeg4-4.4.3
d45f87b
@zlice
telegram-desktop: revbump for ffmpeg-5.1.2
268d64a
@zlice
tg_owt: revbump for ffmpeg-5.1.2
86de34d
@zlice
timg: revbump for ffmpeg-5.1.2
59606a8
@zlice
tracker-miners: revbump for ffmpeg-5.1.2
a22ff15
@zlice
tvheadend: revbump for ffmpeg4-4.4.3
89a4d83
@zlice
unpaper: update to 7.0.0.
d49e007
@zlice
vba-m: revbump for ffmpeg-5.1.2
5daefe2
@zlice
vice: revbump for ffmpeg4-4.4.3
bdd3731
@zlice
waypipe: revbump for ffmpeg-5.1.2
700701b
@zlice
wf-recorder: revbump for ffmpeg-5.1.2
114f4ff
@zlice
xpra: revbump for ffmpeg-5.1.2
bb4872c
@zlice
openimagedenoise: revbump for openimageio 2.4.8.1
19ddc64
@zlice
Copy link
Contributor Author

zlice commented Mar 23, 2023

K everything should be building except the few outliers I added to OP.

Also, should we change this message? # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! seems like anything with ffmpeg-devel and I'm not 100% convinced that covers it (ytmdl doesn't have 'devel' but ffmpeg in 'depends')

@zlice
Copy link
Contributor Author

zlice commented Mar 31, 2023 •
edited
Loading

fwiw, all ffmpeg5 packages seem to compile with a few extra patches for ffmpeg6

not sure if skipping 5 to 6 is fine (6 has all the av1 codec stuff i personally want)

note: still haven't gotten around to testing

@zlice
Copy link
Contributor Author

zlice commented Apr 4, 2023 •
edited
Loading

installed ffmpeg6 last night https://github.com/zlice/void-packages/tree/ffmpeg6-split

chromium is the only exception so far i think

chrome just needs flags i guess? chromium --use-vulkan --enable-features=VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization --disable-features=UseChromeOSDirectVideoDecoder,UseSkiaRenderer --disable-reading-from-canvas --webgpu --ignore-gpu-blocklist --enable-raw-draw --disable-gpu-driver-workarounds --use-gl=egl works for me

@zlice
Copy link
Contributor Author

zlice commented Apr 23, 2023 •
edited
Loading

Have been running ffmpeg6 fine for a bit now, though on top of my gstreamer and intel packages PRs mentioned (switched intel stuff to oneVPL). Want to double check commits on the 6 branch even without gstreamer/intel changes.

This does touch a lot and is relying on other big changes. What should next steps be? (will probably make another PR with the 6 branch at some point)

@zlice
Copy link
Contributor Author

zlice commented May 5, 2023 •
edited
Loading

Closing this in favor of #43761 since I have been running ffmpeg6 for a month now.

@zlice zlice closed this May 5, 2023
@zlice zlice deleted the ffmpeg5-split branch January 11, 2024 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@paper42 paper42 paper42 left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@zlice @paper42 @sgn